[main] Bump a few package versions#14003
Merged
dougbu merged 2 commits intodotnet:mainfrom Nov 2, 2023
Merged
Conversation
Contributor
Author
dougbu
commented
Aug 31, 2023
src/SignCheck/Microsoft.SignCheck/Verification/NupkgVerifier.cs
Outdated
Show resolved
Hide resolved
1 task
missymessa
reviewed
Sep 25, 2023
dougbu
force-pushed
the
dougbu/bump.versions/main
branch
2 times, most recently
from
dd15f74 to
94a8da7
Compare
Contributor
Author
|
/ping reviewers or anyone in @dotnet/arcade-contrib 😁 |
garath
reviewed
Oct 27, 2023
src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj
Outdated
Show resolved
Hide resolved
- small part of dotnet/dnceng#345 - bring System.Security.Cryptography.Xml v6.0.1 in directly - see dotnet/dnceng#1207 - useful wherever Microsoft.Build.Tasks.Core is used - react to deprecation of `ContentItemCollection.FindItemGroups(...)`
- should not be needed w/ Directory.Packages.props change
dougbu
force-pushed
the
dougbu/bump.versions/main
branch
from
c5d2060 to
74febe6
Compare
garath
approved these changes
Nov 2, 2023
Contributor
Author
|
/backport to release/8.0 |
Contributor
|
Started backporting to release/8.0: https://github.com/dotnet/arcade/actions/runs/6750841711 |
Contributor
|
@dougbu backporting to release/8.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: [main] Bump a few package versions - small part of https://github.com/dotnet/dnceng/issues/345 - bring System.Security.Cryptography.Xml v6.0.1 in directly - see https://github.com/dotnet/dnceng/issues/1207 - useful wherever Microsoft.Build.Tasks.Core is used - react to deprecation of `ContentItemCollection.FindItemGroups(...)`
Using index info to reconstruct a base tree...
A Directory.Packages.props
M eng/Versions.props
M src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj
M src/Microsoft.DotNet.ApiCompat/src/Microsoft.DotNet.ApiCompat.csproj
M src/Microsoft.DotNet.ApiCompat/tests/Microsoft.DotNet.ApiCompat.Tests.csproj
M src/Microsoft.DotNet.Arcade.Sdk.Tests/Microsoft.DotNet.Arcade.Sdk.Tests.csproj
M src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
M src/Microsoft.DotNet.ArcadeLogging/Microsoft.DotNet.ArcadeLogging.csproj
M src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj
M src/Microsoft.DotNet.Build.Tasks.Installers/Microsoft.DotNet.Build.Tasks.Installers.csproj
M src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj
M src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/Microsoft.DotNet.Build.Tasks.TargetFramework.csproj
M src/Microsoft.DotNet.Build.Tasks.VisualStudio.Tests/Microsoft.DotNet.Build.Tasks.VisualStudio.Tests.csproj
M src/Microsoft.DotNet.Build.Tasks.VisualStudio/Microsoft.DotNet.Build.Tasks.VisualStudio.csproj
M src/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj
M src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj
M src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj
M src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj
M src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj
M src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj
M src/Microsoft.DotNet.SourceBuild/tests/Microsoft.DotNet.SourceBuild.Tasks.Tests.csproj
M src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.VersionTools/tasks/Microsoft.DotNet.VersionTools.Tasks.csproj
Auto-merging src/Microsoft.DotNet.SourceBuild/tests/Microsoft.DotNet.SourceBuild.Tasks.Tests.csproj
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.SourceBuild/tests/Microsoft.DotNet.SourceBuild.Tasks.Tests.csproj
Auto-merging src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj
Auto-merging src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj
Auto-merging src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.NuGetRepack/tests/Microsoft.DotNet.NuGetRepack.Tests.csproj
Auto-merging src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.NuGetRepack/tasks/Microsoft.DotNet.NuGetRepack.Tasks.csproj
Auto-merging src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj
Auto-merging src/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj
Auto-merging src/Microsoft.DotNet.Build.Tasks.VisualStudio/Microsoft.DotNet.Build.Tasks.VisualStudio.csproj
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.Build.Tasks.VisualStudio/Microsoft.DotNet.Build.Tasks.VisualStudio.csproj
Auto-merging src/Microsoft.DotNet.Build.Tasks.VisualStudio.Tests/Microsoft.DotNet.Build.Tasks.VisualStudio.Tests.csproj
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.Build.Tasks.VisualStudio.Tests/Microsoft.DotNet.Build.Tasks.VisualStudio.Tests.csproj
Auto-merging src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/Microsoft.DotNet.Build.Tasks.TargetFramework.csproj
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.Build.Tasks.TargetFramework/src/Microsoft.DotNet.Build.Tasks.TargetFramework.csproj
Auto-merging src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj
Auto-merging src/Microsoft.DotNet.Build.Tasks.Installers/Microsoft.DotNet.Build.Tasks.Installers.csproj
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.Build.Tasks.Installers/Microsoft.DotNet.Build.Tasks.Installers.csproj
Auto-merging src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.Build.Tasks.Feed/Microsoft.DotNet.Build.Tasks.Feed.csproj
Auto-merging src/Microsoft.DotNet.ArcadeLogging/Microsoft.DotNet.ArcadeLogging.csproj
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.ArcadeLogging/Microsoft.DotNet.ArcadeLogging.csproj
Auto-merging src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
Auto-merging src/Microsoft.DotNet.Arcade.Sdk.Tests/Microsoft.DotNet.Arcade.Sdk.Tests.csproj
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.Arcade.Sdk.Tests/Microsoft.DotNet.Arcade.Sdk.Tests.csproj
Auto-merging src/Microsoft.DotNet.ApiCompat/tests/Microsoft.DotNet.ApiCompat.Tests.csproj
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.ApiCompat/tests/Microsoft.DotNet.ApiCompat.Tests.csproj
Auto-merging src/Microsoft.DotNet.ApiCompat/src/Microsoft.DotNet.ApiCompat.csproj
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.ApiCompat/src/Microsoft.DotNet.ApiCompat.csproj
Auto-merging src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj
CONFLICT (content): Merge conflict in src/Common/Microsoft.Arcade.Test.Common/Microsoft.Arcade.Test.Common.csproj
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
CONFLICT (modify/delete): Directory.Packages.props deleted in HEAD and modified in [main] Bump a few package versions - small part of https://github.com/dotnet/dnceng/issues/345 - bring System.Security.Cryptography.Xml v6.0.1 in directly - see https://github.com/dotnet/dnceng/issues/1207 - useful wherever Microsoft.Build.Tasks.Core is used - react to deprecation of `ContentItemCollection.FindItemGroups(...)`. Version [main] Bump a few package versions - small part of https://github.com/dotnet/dnceng/issues/345 - bring System.Security.Cryptography.Xml v6.0.1 in directly - see https://github.com/dotnet/dnceng/issues/1207 - useful wherever Microsoft.Build.Tasks.Core is used - react to deprecation of `ContentItemCollection.FindItemGroups(...)` of Directory.Packages.props left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 [main] Bump a few package versions - small part of https://github.com/dotnet/dnceng/issues/345 - bring System.Security.Cryptography.Xml v6.0.1 in directly - see https://github.com/dotnet/dnceng/issues/1207 - useful wherever Microsoft.Build.Tasks.Core is used - react to deprecation of `ContentItemCollection.FindItemGroups(...)`
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
Contributor
|
@dougbu an error occurred while backporting to release/8.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
dougbu
added a commit
to dougbu/arcade
that referenced
this pull request
Nov 3, 2023
- small part of dotnet/dnceng#345 - was dotnet#14003 in main - bring System.Security.Cryptography.Xml v6.0.1 in directly - see dotnet/dnceng#1207 - useful wherever Microsoft.Build.Tasks.Core is used - add minimal Directory.Packages.props that only handles ^^ for now - choice to use Central Package Management all up in this branch deferred - react to deprecation of `ContentItemCollection.FindItemGroups(...)`
1 task
dougbu
added a commit
to dougbu/arcade
that referenced
this pull request
Nov 6, 2023
- small part of dotnet/dnceng#345 - was dotnet#14003 in main but could use Directory.Packages.props there - bring System.Security.Cryptography.Xml v6.0.1 in directly - see dotnet/dnceng#1207 - useful wherever Microsoft.Build.Tasks.Core is used - react to deprecation of `ContentItemCollection.FindItemGroups(...)`
ViktorHofer
reviewed
Nov 6, 2023
| <PackageVersion Include="System.Composition" Version="$(SystemCompositionVersion)" /> | ||
| <PackageVersion Include="System.IO.Packaging" Version="$(SystemIOPackagingVersion)" /> | ||
| <PackageVersion Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" /> | ||
| <PackageVersion Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlVersion)" /> |
Member
There was a problem hiding this comment.
Can you please explain why this transitive dependency bump was necessary? What was the old version that came in and in which projects?
Contributor
Author
There was a problem hiding this comment.
v6.0.0 came in before, in every project that referenced Microsoft.Build.Tasks.Core
Member
There was a problem hiding this comment.
I see. Did you consider updating the Microsoft.Build packages instead? I see that newer packages don't bring the non-desirable one in anymore. VS 17.8 (which is required by main anyway) already supports .NET 8.
Contributor
Author
There was a problem hiding this comment.
I considered it but hit some source-build issues. we could change the approach but I'm not sure that's worthwhile
dougbu
added a commit
that referenced
this pull request
Nov 7, 2023
- small part of dotnet/dnceng#345 - was #14003 in main but could use Directory.Packages.props there - bring System.Security.Cryptography.Xml v6.0.1 in directly - see dotnet/dnceng#1207 - useful wherever Microsoft.Build.Tasks.Core is used - react to deprecation of `ContentItemCollection.FindItemGroups(...)`
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
ContentItemCollection.FindItemGroups(...)To double check: